Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eoehoma Firearms (& friends) #2315

Merged
merged 45 commits into from
Nov 18, 2023
Merged

Eoehoma Firearms (& friends) #2315

merged 45 commits into from
Nov 18, 2023

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Aug 28, 2023

About The Pull Request

Screenshot_5451

Holy shit, this should not have taken a year to make

Adds the E-10, E-11, E-40, E-50, and E-60 to the game. Weapons manufactured by defunct firearms company Eoehoma Firearms.

Founded in 77 FS, Eoehoma was a early pioneer of ‘hybrid’ Solarian and Kalixcian laser weapons. The company went bankrupt due to increasingly poor and risky decision making, and all of it's patents were bought out by Nanotrasen. While Nanotrasen's Emitters bear a striking resemblance to the E-50, otherwise Nanotrasen has not produced any of Eoehoma's old weapons, instead focusing on Sharplite designed weapons.

Other changes:

  • NT and Sharplite weapons have different fire sounds from each other
  • Laser weapons buffed to 20 -> 25 damage
  • Pulse shots don't destroy walls and are now 50 -> 40 damage
  • Emitter shots now do 30 -> 60 damage
  • Various grammar fixes
  • Removes some non-lore compliant mentions
  • Adds a manufacturer indicator to many guns
  • Ports Makes it more noticeable when a weapon recharger has finished recharging tgstation/tgstation#60353
  • Resprites various laser weaponry, notably the pulse guns.
  • Deathsquad and ERT/LP hardsuits have been redone

Why It's Good For The Game

image
image
image
image
ceredits to tetrazeta for the unfinished deathsquad sprite, i simply finished it and touched it up
image

One of the last things i remember the old leads planned was to buff lasers to make them stand up to the various ballistics better. Also allows Pulse Rifles to be more used in events by nerfing them to not be comedically overpowered. Now they are just Overpowered.

More ruin content and such. I'm sure the maptainers will make good use of this stuff.

And sprites, i fucking love sprites

Changelog

🆑 retlaw34, tetrazeta
add: Eoehoma Firearms, a new guns manufacturer!
add: ERT and "Asset Protection" Hardsuits have gotten a new look!
add: New laser fire sounds

balance: Lasers now do slightly more damage
balance: Pulse rifles don't destroy walls anymore and do slightly less damage, and have lost their stun mode.
balance: Emitters do 60 damage and create turf fires on hitting a non-supermatter object.
fix: Various laser weapons that had broken autofire (E-TAR and the Tesla Cannon) now work

spellcheck: Grammar on some descriptions was corrected.
/:cl:

@rye-rice rye-rice requested review from a team as code owners August 28, 2023 09:06
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Aug 28, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Oct 29, 2023
Copy link
Contributor

github-actions bot commented Nov 4, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Nov 9, 2023
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@rye-rice
Copy link
Member Author

conflict deez nuts

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Nov 15, 2023
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 15, 2023
Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

code/modules/projectiles/guns/ballistic/assault.dm Outdated Show resolved Hide resolved
@thgvr thgvr requested a review from MarkSuckerberg November 15, 2023 23:02
@thgvr thgvr dismissed stale reviews from Apogee-dev and MarkSuckerberg November 17, 2023 14:38

This review was addressed

@thgvr thgvr added this pull request to the merge queue Nov 18, 2023
Merged via the queue into shiptest-ss13:master with commit 223dc74 Nov 18, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants